updating to qa branch