P5 fix

Added back set-driven keys that I accidentally deleted.