Updating stuff to make more sense over here