Transition from bornetobe to standelone code