improved formula
 formula even better
pimp1
Merge branch 'develop'