Tightened up the message using includes