+ improved handling of subjects.