modified for android project