Made significant speedup to descriptors method