Add of MD and some changes