updated to rdiscount etc