Block Dating now works with new code organization