modified/added classes for swe2