Amazing fixes!!!!