+fixing main controller (a bit)