Updated remaining methods to use limit code