Added Opponent and some new features