updated repeatable script to fix some regression bugs due to fixes for block layouts