minor rework of limitations