Added the ability to add limits
Fixed bug with the conversion allowing the limits to still exist.