changes to support nicer feedback to user