stabilizing the code to handle large load
merging changes