Made the structure even better! Whoo!