[FIX] changed template and calc