Added a limit and score threshold