Deleted old comments, added more complex form