4B and minor 5 changes