Some changes to Usage