merge with davidcrosby