Add back some things I shouldn't have taken out