Tweaking syntax for cf9
Rolling back version of fw1