Added Derrick's and Roni's code