Finish app-core-2 works