switchers + fix form
merged