Added some controller stuff