editing line 82-83