Master working branch for FEvoR