Too many changes, but closing in on completion