moved teapots, condensed code