new functions + change to keys.js