Made some changes with Jed