updated all feedacks from eliot