overhaul for client's demo