[IMP] use tuples where applicable