Added our changes to make this work