Added 432-p calc support