Updated AllHelperFunctions