moved current functionality to where it belongs