minor changes for figaro