Fixed issue 1 and corrected location of key