First step in changing to design suggestion by Bo.