Stuff I forgot to add on the previous commit