merging to main script