Changed to use checkoutReader #859 and #857