Removing mirro's change