Updated according to review