Adding everything back in