One last update because of signups
Yet more changes because of signups update