FIX: Final changes for verification and comparison