Add Penalties and goals logic