Part2 of Moviepilot Commit