Added the stuff to allow round to be bypassed