Added some stuff to help with limits