updates / restructuring