#1 add a better message