Feature 2
Fixed bug in F2