review Stone code
review Stone code
update Stick logic