New Model

Removed the cruft of the old design