Small Refactoring s1->s8