Improved according to review