swapped in new startup code