made some changes that suck