Small change on aligngoal and moved old shoot