Updating to b4 features