remove cbf (will be integrated later)
add feeder