added conditions around user mash.