Revisions based on meeting with Jan