some tweaking with msd