added UC#1 functionality