moved from views to views/core