Added message output

(needs testing)