Updating to support both 11.12.8 and 11.4.2