140622 Change calculated wish & fix wish pocket