Added messages and adjusted paramaterisation