not sure if this is a bad merge or something else, but it should be the deleted code above