Made necessary changes and all working well so far