Second changes with more commenting