Some changes based on the notes Moli left