updated to work with osclass 3.2