Final updates before qa testing