undid my "simplification" which probably hurt performance