form stuff
fixed merge