Major updates to CRA.rb