Two cases current

Two cases current