Made some updates to make this saner