Imported sven's design changes