Update to r8 branch, and use own system core