Add demux, and fpla