work on current components