adds f3
Merge branch 'dev'