Add back a few things