Updated forms behaviour