further changes for android