Fixing Bugs

Fixed # Values
Using Key 1 and 2