added calculations and shit