adding a bit more functionality