Main updated

Updated with the new messsages tpes