Added calculator v2.5