Add hamiltont's suggestions