Pulled in changes, renamed rb file