Use current (36/38)

Use current