Everything functional again