Reverted to (Slightly) Stripped Down 2013 Code