2.4 updates and changes