now format the inputs correctly
Merge branch 'round' into testing