Added script blocks to reduce load times
Fix merge conflict