add two messages. clear up code.