Changes acording to David's comments