Changed the key system to an easier to use one