Some edits to estimation part