altering to jaekwons changes