After merging with Ganga's changes for random adds