Added auto-start feature