Some adjustments in option 3
Final version