Made some more changes EON commit.