quality control ongoing
fixed merge conflicts
fixed header merge conflicts