Do this the right way