17_02/ 2 - need to check and add some logic