Merge Current Preview Code with Mine for Performance Testing