To merge with major changes