Attempted to remake some of the changes I forgot to push.