Re-add some stuff