further changes for AJS