v1.0 cleaned up