1. Fixed the bug from before
1. Reverted to old core routine