updated HQView
fixed conflicts
updated HQView
merged