a little modification