added changes to the form rendering engine