Yes, I think that looks good now. Remember to rebuild the custom cache so that the cached data updates to the fixed expressions. Database > Database Management > Rebuild Cache > Custom Cache rebuild. If you want to check which hands will be counted you may want to take a look at this post which expl...