change according to comments