refactoring to core view to fix model redundency