Update: Implemented some functions