made some changes i guess