Added better hacky Player