Adopted suggested changes