A few changes... should still work.