Use limit
Update deprecation notice