Add some more stuff back in