Adding everything back