made some weird changes