Core added, small memory optimization