Still some work to do