update after Doomgamer advice