do a little modification