Prepared some commented out changes for dev branch updates