merge with Gina's version 37. 
Comment changes that bring errors