Fix orbat, simpler now