Oak fixed the problems Elliott mentioned