Changed plan to better match with the goals of the project