Merged with ora's comments