consolidating & form updates