Fixed it all