Added limit and case checking for some methods