some changes on Davides comments