fixes the third big change