Use current (8/38)

Use current