Added more messages. Need testing.