Added better basic player