Use full parameter name for clarity
Fix goplay function