Heavility updated and commented