Updated to be backwards compatible with 3.4"