edited some controllers