Rework, update playground