Patch 2

Merging all my patches