Works well... finally
Last minute changes
Fixed merge