Added more limits