new changes done

new changes done 2
Merge branch 'feature/ticket2'