added current back in