add extra messages and remove unnecessary steps