f2 - take 1

now i'm making changes for f2
f2 - take 2
merge of f2 take 2