Version 2.0

Nailed it.
great, less code, fewer bugs!