added some calc