cleaned up versions