Modifying for the new specialization implementatiin