More change to new RL. Not completed yet