Adding changes to E4...