added more rwd stuff