add error_check
remove statements commented out