Optional calculateFrom, need to look at better solution....