Updated for rvm