Added end game conditions