Made small design changes per Eli's request