remove gson and use Parcelable