Fixing Play Flow