Focus on core problems

Focus on core problems