added more features to forms