merging conflicts between Sam and Risa/Rafael's refactorings