tweaked setting and design