Updated structure to give everyone their own space