Tweaked to work with vagrant demo