Tweaked a couple of codes, for testing