restructuring into extras