Feature/update q tip2