first iteration fixing project