Some changes based on Bennis feedback