Changed to MVC and fixed collision