added Figaro and keys