lots of changes - adding greeks