added some missing things back from new questions