Updated for Code Review on 12/10/2014