Some changes from dev