Changes in quick run
Changes in Quick RUn
resolve merge coinflict