Added weapon selection. Problem when switching