Changes bsed on feedback