Updated: Seperate Controllers