Restructured gameflow + removed things