Implemented feedback from Burcu