modifies base on Manj's review advise.