updating for rtt changes
merge