fixed performance issues in checkout