renamed stuff and added new message type