Revamp of structure, additions to c.rb