Made some unfinished changes