Made necessary changes and all is well so far