Created by: InfiniteWhite
final update to patch 3, so that patch 3 can then be merged to master branch