revert last commit and update common.rb