Tim added a bit of code