split things up better to track this annoying slowness