Added back in some things I did earlier