Almost done prep for submission