Fix Player files and used different method