changes to work in sdk 10