more changes to forms