Few changes based on FaFa's requests.
merge