Removed testing code for Justin and Andrew