changes for android support