Refactored to Modern Syntax.
Removed V1.