changed some stuff for MST