merge with rex update