CR changes: pass value instead of whole array