re-add components for working environment