Added form logic without breaking anything