I think I will regret these changes...