added FOP-support