Once again I forgot to add like half of the changes...