merged changes for play and pause
changes merge for play and pause