Added some conditional for starting