tweaked design a little