Changed to current handling