properly calculating cost
Merge branch 'floodlight' into staging