Updated HelperFunctions