recoded line 603-607