adding Matt G's design suggestions