Updates for FF