added optional goals (by rinkel)