Implementation Diff attached