Geometric formulae updated for flow control
new files