A little code change here and there