Some more changes for the general design. Changes to EPV