Adds back some logic