Update of initial mash implementation