added android part