Some more work on RPG