fixing controllers......