update from cpraveen:master after scaling test