Project final fixed