More progress towards 1.4