Tweaked design with small improvements