almost functional again.