added additional forms and functionalities