Minor adjustment & tested.