Made a few minor adjustments before demo