correction to my post, thanks Tony
cleaning up
fixing merge conflict