reverted all modifications made for debug purpose