More progress on 1.5