minor changes - working 2a