Change to Standard API
Merge branch 'david'
Merge from Master