STORY-362 "COMPENSATION" part-2