as submited + comments