added figaro and made relevant changes