Made requested changes from last commit

EV-112