some utils modification