Still looks like there more work to be done