Making controller check better