change - current

Rewritten current handling