Attempt to simplify enigmasaurus design