added limit stuff