finish my api part implementation