Review feedback addressed