Working on 0.6.2