fixed based on feedback and :verify