James requests v1 - Fixes for first release