Some Changes, idk what I did anymore