Started implementing a limit in agenda view