Merged the changed from nick0314221