added a little modification