rejiggering magic numbers