WIP - respond to Rob's comment