stage 3 (bunch of thoughtless changes, fast done)