2014.12.30 I brushed the code a bit