more work optimizing (hopefully)