Some changes to address feedback