improve utility
misc change