small changes to fops
merge fops