fixed addRx and stuff