fixing bug, spike on view refactoring