Changed some controllers