jj and marcus

Modified