added a little more functionality