Changes made to get a demo going.