Added new messages; merged better with thijs's source (2);