lines 24, 42 need to be removed