Some improvements for playing