cool design changes by @robmod