made changed based on feedback