New patch updated from feedback received.