edit according to comments