FIXED SHIT MAYBE OMG PLZ GOD
merging pull conflicts