Astronomy Unit Redesign