Added stop and play