added SWASHES support