base cleaned up original