Optimised libwapcaplet two folds , over the previous one