implemented Flint's advice