Redesign assignment6