removed threading for better play support