rejiggering logic because of first run bug