Change some things in preperation for stuff