Cleaned up for v2