Feature/gfc 139 calc most challenges