Getting ready for merge with research