edit of goal first half working