basic structural changes
andy makes it fun