str and ul introduced, more serious re-arranging