migration script update

updated migration script and optimised the script to take a shorter time
Merge branch 'sola'