Changed how the code works, not sure if I will keep it this way