Manual merged THANKS A LOT GIT