Updated to latest version as seen in westgate repo