Play

some optimizations