some changes to some functions
renamed file