completed more functions
