I was having a few weird bugs so i switched up some things