Some changes after more testing