All this worked well on 0.6