Simplify evaluation and add middle game component