added appropriate messages