sprinkling now SP and [SP] which I skipped for clarity's sake
more changes here