Cleaned source for v1