reorganized core pt.1