Fixxy a clash between mine and aarons code