Fixed up part of it