Controller improve