Modified Goal.java slightly