format changes, and change how the session variables are handled in the controller