Added alias clash detection
Changed wether to whether