Changes to rpg base