removed lines 270-301