Increased upper size limit to 21