removed android annotations and changed back to regular android