Solution 1.5 added
Modified for solution 1.5
Remove logging