More work towards 1.4