Removed V/F, added integrals
Separated V/F from the rest