[REV] Some changes