merged feedback from Nicholas.