Updated after debugging default.rb