Deleted too much stuff, back to original.