Some changes v2