Changes on how hands are handle