added some limits