merging feature/ticket2