Do this earlier