integrate with #current?