New changes for #2