new version with fine tune calculations