Fixed Everything again