need to talk to bruce about this extension