Checkout updates

Checkout procedures hanged...