Revert "Revert "f1""

This reverts commit 0e16cee912acc38a8961b21f19702be7c5cbae80.

Conflicts:
	Test/Test/NMViewController.m
sss