Reworked workspace