Remake without 1 goto