updated for new api 1.3

and CM11