First attempt at fixing project pattern.