merging larz changes