Working Caleb redesign