Improved autopm, removed injection