Added new checks in form