-- worked on for BRES-20