added AA and BP find and goto