add changes for working with 5.10