Updated form and functions for demo