little changes with swing there was more but github hate me