ticket:5 provide some tweaks