Changed plan back into it's own class