updated for a new modern jeffrey