Fixed it all!