Revert "Revert "little changes""

This reverts commit 66fc743fbf880b16106f9a12a5f27296bf34d659.