added skip game and search refactor