additions nbased on feedback