RWD 0.84

some changes