reworked spaces hierarchy