2nd commit, changes made by prof jose in jsp