redone enterfact & new plan