Chaned flex token calculation and commends