need to update $current here