updated goal draw code