added ff spport and redcued cp usage