Still not final, more to do