adding back in Xing's stuff