new modal format! cleaning up.