Some minor tweaking for extra umph