refactored and fixed stick problem