Updated RPG finally