[Issue #179] [WIP] adds checks for add limit