fixes
rearranged form