Made a few changes - for cleaner starting base