fixed and improved (n=3000 ca. 190s)