added helper method & amended get handler