managed the clusterfuck of changes again