Changes from aaronsw hackathon.