Added f4
Added f3
Merge branch 'pre-nm' of https://github.com/vinodvr/gbs1 into pre-nm