merge Justin and Roman changes