final commit before presentation
changes to tags and controllers