updated to use Player