Changed few things for Clarity