music player optimized
music player optimized
music fixed and merged