Minor changes to correct for validity