v1 cleaned up