a little restructuring