adding submit_infos and some testing for empty values