more functions
resolved conflict
Rest of functions