added some extra stuff for android