add #current and #set