2.48 and WIP 2.49