updated; has now the limit-stuff