Further updates after 5110 testing