added some more math