MV  & NBA automated with bugfix