diff --git a/benchmark/VRFGasHelper.sol b/benchmark/VRFGasHelper.sol
index 18fa745..07408ab 100644
--- a/benchmark/VRFGasHelper.sol
+++ b/benchmark/VRFGasHelper.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.6.12;
+pragma solidity ^0.8.0;
 
 import "../contracts/VRF.sol";
 
diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
index 5c3e7d2..c9c43aa 100644
--- a/contracts/Migrations.sol
+++ b/contracts/Migrations.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.4.21 <0.7.0;
+pragma solidity ^0.8.0;
 
 contract Migrations {
   address public owner;
   uint public last_completed_migration;
 
-  constructor() public {
+  constructor() {
     owner = msg.sender;
   }
 
diff --git a/contracts/VRF.sol b/contracts/VRF.sol
index 95b7a87..0e8ca56 100644
--- a/contracts/VRF.sol
+++ b/contracts/VRF.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.5.3 <0.7.0;
+pragma solidity ^0.8.0;
 
 import "elliptic-curve-solidity/contracts/EllipticCurve.sol";
 
@@ -452,6 +452,6 @@ library VRF {
   function pointToAddress(uint256 _x, uint256 _y)
       internal pure returns(address)
   {
-    return address(uint256(keccak256(abi.encodePacked(_x, _y))) & 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF);
+    return address(uint160(uint256(keccak256(abi.encodePacked(_x, _y)))));
   }
 }
diff --git a/package.json b/package.json
index 0a2ec88..9b0cf25 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "ganache-cli": "6.12.1",
     "solidity-coverage": "0.7.12",
     "solium": "1.2.5",
-    "truffle": "5.1.53",
+    "truffle": "^5.11.5",
     "truffle-assertions": "0.9.2"
   }
 }
diff --git a/test/TestHelperInternals.sol b/test/TestHelperInternals.sol
index 6c977d7..6279cad 100644
--- a/test/TestHelperInternals.sol
+++ b/test/TestHelperInternals.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.6.12;
+pragma solidity ^0.8.0;
 
 import "../contracts/VRF.sol";
 
diff --git a/test/TestHelperVRF.sol b/test/TestHelperVRF.sol
index 018e1b4..5004af6 100644
--- a/test/TestHelperVRF.sol
+++ b/test/TestHelperVRF.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.6.12;
+pragma solidity ^0.8.0;
 
 import "../contracts/VRF.sol";
 
diff --git a/truffle-config.js b/truffle-config.js
index 822044a..9c1d5be 100644
--- a/truffle-config.js
+++ b/truffle-config.js
@@ -25,7 +25,7 @@ module.exports = {
   },
   compilers: {
     solc: {
-      version: "0.6.12",
+      version: "^0.8.0",
       settings: {
         optimizer: {
           enabled: true,