restructuring a little