added extra stuff, patterns and such