v2

Cleaned up