Ok, moved to controller