Continued coding the feature to change D vs R to other things