Feature/update fop