Shaw signs three-year deal