simplify; ok natano@