Fixing stick assignment
Merging, fixing OI