Minor edits to table structure - removed need for doubles.