More update to basic usage