SS5: improvements