changed some of the commments to fit the new functions