The nilpotency class of p-groups in which subgroups have few conjugates

We consider the problem of how the nilpotency class of a finite p-group can be bounded in terms of the maximum length of the conjugacy classes of (cyclic) subgroups. We sharpen some previously known bounds and also prove that a p-group in which every cyclic subgroup has at most p2 conjugates has class at most 4.