More updated commenting.