New Calculate Methode and other minor changes