adjusted controller and added tests for new fields