adding more functions and handlers