cleaned up v1