with jeff's code