Comments added, almost...