Added limit of 12 back in