edit to line 47