Added make-form function