The 'easy' part of #40