DDF-801: Changed a few features to be manual rather than auto start