added more math