Patch and completed last commit