Final Changes. Final Project With COmments