Add gol logic; in working state