Finish the some jobs of theme by George