Added more commenting