Controller (12-8 update)