some changes (using gson)