more changes to mess