merging Carmen's changes