added message and stuff