Put calculation back under feature preview