final changes - redesign