Attempting to add support for 9.3 & 9.2