Some adjustments, testing commit to qa