Using Eli's suggestions