did part of #2