fixing controllers...