Re-factoring player core.