Final, working on 6.0.1