Add new improved calc