Code

[PATCH] diff overhaul