Another reformat... need to make more robust one