2013_12_30 - Update, removed some testing code