retro-fitted the first two levels to work with the new structure