refactored calculations and project items now works!