Add heavy commenting