Method fixes + Project Plan