FIX Peer review suggestions