minor changes commented out last section