Update some code 2014-11-4 ByMACZ