Starting to re-add things that make sense