Added option to start valid