major changes - structure, patterns and stuff