added msg codes 1 and 2