Fixing #4 (getting rid of ATS heritage)