Upgraded and less impossible version