Updated UnicornPlayer