Applied changes proposed on discussion