Added in Brandon's visual changes