Add Tibor's changes