Core functions completed