Add twin support and goal checking