Updates to start fixing rigid code and updates for 2014 requirements