Make album play and track listen more liek real expected usage