edited some controllers to return all values