Updated form ready for backend