fixed functions
updating branch